Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

executor,expression: avoid to append nil to warnings (#36304) #36931

Merged
merged 5 commits into from
Aug 9, 2022
Merged

executor,expression: avoid to append nil to warnings (#36304) #36931

merged 5 commits into from
Aug 9, 2022

Conversation

ti-srebot
Copy link
Contributor

@ti-srebot ti-srebot commented Aug 5, 2022 •
edited
Loading

cherry-pick #36304 to release-6.1
You can switch your code base to this Pull Request by using git-extras:

# In tidb repo:
git pr https://github.com/pingcap/tidb/pull/36931

After apply modifications, you can push your change to this PR via:

git push git@github.com:ti-srebot/tidb.git pr/36931:release-6.1-6418350e9755

Signed-off-by: zyguan zhongyangguan@gmail.com

What problem does this PR solve?

Issue Number: close #31569

Problem Summary: two issues are described in #31569:

  1. nil pointer exception was thrown when show warnings.
  2. the warning messages were incompleted (missing template args).

What is changed and how it works?

Previously we always append the warning error even when it's a nil here, which leads to the first issue. This PR uses sc.HandleTruncate to handle trancate warnings uniformly and amends warnings generated on inserting.

Check List

Tests

  • Unit test
  • Integration test
  • Manual test (add detailed scripts or steps below)
  • No code

Side effects

  • Performance regression: Consumes more CPU
  • Performance regression: Consumes more Memory
  • Breaking backward compatibility

Documentation

  • Affects user behaviors
  • Contains syntax changes
  • Contains variable changes
  • Contains experimental features
  • Changes MySQL compatibility

Release note

Please refer to Release Notes Language Style Guide to write a quality release note.

None

@zyguan @ti-srebot
cherry pick pingcap#36304 to release-6.1
fa10afa 
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-chi-bot
Copy link
Member

ti-chi-bot commented Aug 5, 2022 •
edited
Loading

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • tangenta
  • xhebox

To complete the pull request process, please ask the reviewers in the list to review by filling /cc @reviewer in the comment.
After your PR has acquired the required number of LGTMs, you can assign this pull request to the committer in the list by filling /assign @committer in the comment to help you merge this pull request.

The full list of commands accepted by this bot can be found here.

Reviewer can indicate their review by submitting an approval review.
Reviewer can cancel approval by submitting a request changes review.

@ti-srebot
Copy link
Contributor Author

/run-all-tests

@ti-chi-bot ti-chi-bot added do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. release-note-none Denotes a PR that doesn't merit a release note. labels Aug 5, 2022
@ti-chi-bot ti-chi-bot removed the do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. label Aug 5, 2022
@ti-srebot ti-srebot mentioned this pull request Aug 5, 2022
Merged
12 tasks
@VelocityLight VelocityLight added cherry-pick-approved Cherry pick PR approved by release team. labels Aug 5, 2022
@ti-srebot ti-srebot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. type/6.1-cherry-pick labels Aug 5, 2022
@ti-srebot ti-srebot requested a review from xhebox August 5, 2022 09:08
@ti-chi-bot ti-chi-bot removed the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Aug 5, 2022
@ti-srebot
Copy link
Contributor Author

@zyguan you're already a collaborator in bot's repo.

@ti-chi-bot ti-chi-bot added the size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. label Aug 5, 2022
@zyguan
resolve conflicts
bc81d48 
Signed-off-by: zyguan <zhongyangguan@gmail.com>
@zyguan
resolve conflicts in ut
805fcaa 
Signed-off-by: zyguan <zhongyangguan@gmail.com>
@ti-chi-bot ti-chi-bot added size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. labels Aug 9, 2022
@zyguan
resolve conflicts
feb044c 
Signed-off-by: zyguan <zhongyangguan@gmail.com>
@zyguan
fix show warnings test
1f442d0 
Signed-off-by: zyguan <zhongyangguan@gmail.com>
@sre-bot
Copy link
Contributor

sre-bot commented Aug 9, 2022

Code Coverage Details: https://codecov.io/github/pingcap/tidb/commit/1f442d0df0475519c92764088ac6d8bb22ce8f57

@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Aug 9, 2022
@ti-chi-bot ti-chi-bot added status/LGT2 Indicates that a PR has LGTM 2. and removed status/LGT1 Indicates that a PR has LGTM 1. labels Aug 9, 2022
@xhebox
Copy link
Contributor

xhebox commented Aug 9, 2022

/merge

@ti-chi-bot
Copy link
Member

This pull request has been accepted and is ready to merge.

Commit hash: 1f442d0

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Aug 9, 2022
@ti-chi-bot ti-chi-bot merged commit 475c6a8 into pingcap:release-6.1 Aug 9, 2022
@xhebox xhebox deleted the release-6.1-6418350e9755 branch August 9, 2022 06:06
@purelind purelind added this to the v6.1.1 milestone Aug 23, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@xhebox xhebox xhebox approved these changes

@tangenta tangenta tangenta approved these changes

Assignees

@zyguan zyguan

Labels
cherry-pick-approved Cherry pick PR approved by release team. release-note-none Denotes a PR that doesn't merit a release note. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. status/can-merge Indicates a PR has been approved by a committer. status/LGT2 Indicates that a PR has LGTM 2. type/6.1-cherry-pick
Projects
None yet
Milestone
v6.1.1
Development

Successfully merging this pull request may close these issues.
8 participants
@ti-srebot @ti-chi-bot @sre-bot @xhebox @tangenta @zyguan @VelocityLight @purelind